From: kaf24@firebug.cl.cam.ac.uk Date: Wed, 3 May 2006 12:33:01 +0000 (+0100) Subject: Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16108^2~22^2~5 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=0d6ad09a09f5e915a6fdb3a402cbd9aa9d4c3788;p=xen.git Fix mismerge of vmx vm86 patch: 9915:e1409c2ace46afd67b54de1f5c0b2b6d3721ca3b Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 42f502074a..ebdd18ee12 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -550,7 +550,7 @@ void vmx_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) __vm_set_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB); else __vm_clear_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB); - if (regs->rflags & EF_VM) + if (regs->eflags & EF_VM) fixup_vm86_seg_bases(regs); __vmwrite(GUEST_CS_SELECTOR, regs->cs);